add links & some fix