Fixes

- fixed FindEnginesOfIntake
- refactoring to handle all keyhits in a single update loop