some minor fixes..