adding randomness, cleaning up spawn controller