Filled in a lot of the command work and added a few things elsewhere (so descriptive :P)