+ minor fixes..