Partial bug fixes of lab and expt; sweep working?