Once I have the innards cleaned up, I will probably tack weld the trigger pin in place so that the trip lever cannot be readily removed. That should help. I have now also welded in a guide block to further limit trip lever movement. Pics to follow later. Sadly, I accidentally fried my trigger spring when it got hit with a welding electrode... on the hunt for a replacement. This has stalled the current build - sadly.