Parser Fixes

Fixed several issues in the parser for various cases. Added the full
string back into output for easier checking. Redefined splits to handle
various edge cases better.