Merge pull request #756 from RobertBColton/master

General Fixes - Merging by request. Haven't tested. Probably won't be back until 24th/25th, so if something breaks - tough luck.
Cleanup of CLI and loading some room properties.