Assignment 3 progress, assignment 2 fixes