bugfixes mostly