more minor fixes..