Reworked code a bit pertaining to new shooter design.