last fixes on hw3