some fixes
a lot of fixes