lab2 + some repairs on lab1 vol2