one assignment remaining, woo! more fixes