More link, few fixes