Added documentation strings, some ideas for cleaning up the cli