more general stuff, probably ditching survival mode
general code cleanup

this commit is bugged; player.moon won't compile for some reason.
this part isn't entirely true now is it?