Update parser

Add multiple support. Fix callback bugs.