test
some fixes
lot of fixes