Bug fixes and adding "rooms" for notes