Lab3 fix again. And more empty/minor changes to lab4