Updates in prep for final, 3/11/13