add pixel masking, get rid of old beamspot stuff