Assignment 4 - fix solutions