More syntax and grammar tweaks