more minor updates
Merge pull request #10 from Social-Solar/jgibbs

more minor updates