Completed 8-9-2017

  • Various backend changes for stability