putting it together lab
minor mode changes