Tutorial 27 - Cleanup and Comments + small fixes