Needlegun tuning & gun refactor