Fixed error that happened with extra long URLs, updated links