fix ALL(I wish) the things!