Coffee Break: A sip away from doom: Update 2.1

Bugfixes and QOL changes