add improvements on perf and fix broken links