I second the Powder River kit. They make several options but I don't care for their trigger feel. It pinches my finger, but I have large hands. The Freedomsmith Fat Daddy triggers for the XDM are excellent upgrades. They help with pre and over travel. Put them together with the PR springs and sear, or have a good smith put them together and slick up the internals while they are at it, and it really smooths out the XD series guns. I would also beef up the base pads with Springer or similiar metal pads if you will be shooting on a concrete floor.