some fixes in the commit
some fixes in the commit