Fixes to DOT printer
Further misc fixes