fixing parsing errors, refs #8 #9