Fixed urls not being read, fixed urls repeating themselves
Finish 1.1.2