New repo path + a couple bugfixes