Updates for Jamal's comments and run through exercises