added some more randomness to spawning and fixed a remove bug