fixed bugs and complementary urls
Merge conflicts