Added comments and alternative command line options