some grammar changes and general fixups