Fixes

bunch of fixes