major parser cleanup
simplify names
simplify stream handling
dump handler
sort methods