Lots of fixes and a new repo