Various updated for tutorials