Move next room functionality to editor, minor cleanup.