Merge Dave's addition of many changes mostly with learning nuggets#24