More Fixes, and loot & xp handling work

Might be the last commit before bed.