various changes, added .Xkeymap file