hairy-bugfixes!