white space
white space cleaning
white space
cleanup and bug fixes in output commands