Grammar and small tweaks