Updated command line usage and general clean up
Updated readme