Updating tutorial + code cleanup + bug fixes