Various changes/fixes; u2 handouts added