first commit
some fixes
some fixes 2