Sabotloader: About the front sight, what I have found is with a very fine file, carefully file an angle on the gold bead that leaves it long on the bottom but neatly cuts the top back to the steel portion of the sight. What this has done for me is to allow the bead to show up in all different lighting situation. As you know the actual diamater doesn't change but the angle allows the sunlight to show up on the bead because the angle gives it more area and it no longer is in the shade by being vertical. This has worked well with my peep sighted guns also.
Tape with masking tape the top of the sight and the ramp leadig to the bead before you file, this will keep them from getting marked up if the file wonders. :-)