further output fixes & improvements