sigh, more bugfixes