100% code coverage

Including resulting bugfixes (yay)
1.1.1