Changed player to manual firing.  Minor refactoring.