Updates to Officer Charge and Scatter, BuffService, and Movement

Any help on why BuffService is deleted and added for two lines of change is appreciated.