Fixed for git repository & cleaned up todo.