git staff lines removed, grammar fixes