General edits to Setup lab