Overall cleanup and fixes for all prior commits