added some missing 'use strict' delcarations
fixed conflicts from develop merge