Agreed...I did all that, I also switched to small rifle primers and 110 grains of loose fff triple 7 powder. 260 gr. dead center bullets. Any one of the changes do not do much but when you do it all the difference is amazing. If I had to do one thing it would be the trigger job.Most Encores need trigger jobs ,the forend shaved down and a new hinge pin so that it does not move. Then they become tack drivers.