Hopefully nearly final for 1.2; many fixes, corrections, and compliance changes....