Fixed problem with git and commits
Fixed bugs with recent changes