Clean up all warnings and refactor to single-shooter system.