Install near-complete. Small fixes elsewhere.