Investing in a thread tap and the drill bits to go with it will help to remove some of the extra bolts you need to put on everything. also helps if you have a drill press to keep it all aligned when tapping your threads.