Small changes, preparing for tutorial.