Many grammar fixes and Xen improvements