Parsing improvements, added dump option
Added paper, tweaks needed for that code to work.