bugfixes and such