Grammar and Analytics Fixes