slight bugfixes