loot refactoring and a small armor/shield fix.