Merge pull request #459 from ahgittin/fix/misc

misc minor logging, usage and test fixes