More tutorial changes and associated code modifications