even moar bugfixes