Misc fixes

why the new class?