+ minor improvements