parser and link updates