mentors added, bugs fixed