some grammar fixes, rename a method or two