bugfixes all of them