releases 2.1.1

Various small bugfixes.