Grammar Fixes

Fixed issues with dynamic grammar (1 hours, 1 pint(s)), no more stuff like that. Nice and flowing now.