Lots of comments and few spawning fixes