fixed stuff
fixed link parsing