Fix links and some issue