massive minor edits of lab