A few better debugging and output statements
Merge branch 'iod' of https://github.com/johnbent/fs_test into iod