improved demo example
extracted parser callbacks, test script
clean up