proposal v7 grammar fixes
proposal v8 twitter fixes
Merge pull request #132 from flockonus/master

update with some fixes, thanks!