cleanup add teacher/companion, add view all visuals