Fixed issues identified by Aaron, various labs

Signed-off-by: Vinny Valdez <vvaldez@redhat.com>
Merge pull request #64 from vvaldez/more-in-room-updates

Fixed issues identified by Aaron, various labs