some fix and add links support