Completed 7/25/2017

  • Various backend changes for stability