Merge pull request #220 from dean0x7d/fixes

A few smaller fixes and a test output improvement