Added new repositories and changes some bugs