Second blocking pass, fixing up a bunch of stuff.

Download movie: 11sec_nov08_blocking_02