Pulling cleanup and changes from Ethan into Ethan-Staging

Cleaned up and expanded comments