Functional fixes/cleanup
Address review comments
Address review comments
Merge pull request #4 from chronology/fixies

Functional fixes/cleanup