Added rooms; added options for shorter commands