Beamtime fixes

Cumulative beam time fixes and improvements from October.