Some outstanding, dirty, pre-demo fixes. To be cleaned up. Also, fixed hand-off link.