bugfixes we hope