tweaks to the grammar and visitors