Finished some touches on the output