updated experiment controls and data handling
Merge remote-tracking branch 'origin/laptop-development'