updated screen format and changed some output