more bugfixery