printing tweaks, minor bugfixes