Performance and parsing improvements

Tagging a release following the work done @cnnorris on the original parsing method.