tried to fix the stuff that broke <fingerscrossed> (3 weeks and git breaks!)