Adding tutorial class + small changes