continued tutorial, cleaned up some mess within the basic tutorial