Updates from and to Stoffez

Minor Updates