Mom got stuck in the washing machine: Patch v1.8

Various bug fixes