mostly bugfixes