Cleaned up some scripts

Also trying to improve the wavespawner(two).