Bugs fixed in the output