some cleanup and lesson updates