Mostly finished cleaning up the AV old puzzles.