Some tweaks to Assignment 1