more misc fixes
need to rethink the text output.