bugfixes and things