removed several FIXME's.
Merge pull request #21 from Zedzap/Link_updates2

Link updates2