fixed up more

look at all these commits