+ minor changes