fixing output, cleaning up
housekeeping