updates to Analysis 1 and some generic clean up