additional bug fixes for cleaning up output
additional bug fixes for cleaning up output

fenderglass/ABruijn,fenderglass/ABruijn,fenderglass/ABruijn,fenderglass/ABruijn,fenderglass/ABruijn,fenderglass/ABruijn