fixed some commits 2