fix links and tweak