general code clean up and some parser work
add expected output
add keyword definition handling