fix for latest master and begin work on tutorials