finally fix link reference definitions

finally fix link reference definitions; update TODO