1.1

Lots of bugfixes, adjustments, and changes.