More bugs, now in output, fixed