locks on git preventing commits
minor fixes