inevitable bugfixes...