whoops removed, misc bugfixes