some nice improvements
simplify logging
Merge pull request #1 from camshaft/master

some improvements