Function maintenance and cleaning

Combined org and gather functions for most observational plots into one function. 

Renames several functions and made small edits