Alterations to command line parsing and removal of warnings.