Started on HotelsCreationMode & bugfixes