a bunch more minor fixes