Updated with latest changes, mostly to fix tutorial