Did some more minor tests and fixes, tried to resolve monsters spawning ontop of player and not launching combat.