tweaks and more output info