do some fixes
committing