continue code cleanup of motel module & specs
wrap up majority of motel module and spec updates / fixes