fixing more of my mess