some fixes in output