Some fixes, mostly grammar