Fix js ordering bug, change main repo, reduce waiting