small fixes, add mentoring