Add better help message and command line opts