added rooms
various function names were changed for anti-conflict reasons
fixed up some styles