fix ALL the things