+ minor fixes