cleanup and additions

Added -h option to print available options.