fixing a few bugs
abandoning underscore naming scheme
Merge branch 'master' into gh-pages