Fixed untracked files
Fixed uncommited files