Tidy up some stuff, Fixup fightcaves crash (i think) Fixup ::items command without amount specified
::items