fixed last bugs in commit