clean up, better logging
Merge branch 'master' of https://github.com/tracek/Ornithokrites