Minor big fixes to Comp. Arts Assignment 2