More bug fixes

#Issue 1 and #Issue 2 fixed. Merged loot_spawn into main repository.