work on config cleanup and 1st tutorial example