Fixed issues #642 and #654 and tried to fix #659

Fixed issue #642
Tried to fix #659
Fixed issue #654


PS: Idk why spawn.xml file got changed lol, feel free to revert it