Fixing issues with parsing options and parameters - the heck happened