Sex motel: Improvements and fixes

Improvements and fixes