Added commandline option parsing and a few options