Grammar fixes, rewriting