Merge pull request #1 from jbbarth/vincent

Minor bugs fixed and code cleanup
Add the ability to preview comments