bugfixes hopefully