fixes, a lot of fixes
more fixes