If i remember right 040 wont fit without mods, you can pick up walbro pump kits off ebay and formums liek rex met for around $125. I have one on the way for my liberty and they are pretty much the same set up.
AFM's f**k up on them a fair but as well.Try cleaning it out and see what happens.