Added player spawning, minor changes