small stuff and removed andy's fix for quotes
Merge pull request #97 from ehsteve/master

small stuff and removed andy's fix for quotes