Change the output format of list slightly
First pass at some of the commands