parser fixes, added link handling