Various fixes/upgrades. Added xdm-config