v1.1-1: Fix bugs in v1.1

This deals with at least the major bugs that were in v1.1.
Thanks to @rohkea for finding the majority of the bugs.
(v1.2 will actually focus on usability issues, BTW.)