Fixed commits
Fixed more comments