Updates needed for field collection + doppel work, and classroom site cleanup.