More minor changes to floors and rooms. Must comply with hashCode stuff builtin to java, etc.