More Room fixes

More dumbass mistakes I made