Private Room refactor - Distinguish hidden and secret rooms

Oh wait your whois changes are here too.