Correct and switch stuff to my repo