Tested & fixed existing issues, added spawner