Integrate changes from `2013`
Tested shooter and cage

did not test photo eye stop