Assignment 3b fixes