Refactoring mentor profiles
Fixing a bunch of small post-merge issues.