formatting fixes, add lab 2