Add some links and remove latex macros