Improved some output