Added some outputs to be printed to screen
Made the inputs a little neater