Final Version 1.1

Changed the names of the parser options to make them match up with what
is being collected