Fixed bugs and refined links