Nagel fixes

- handle more than one car
- different (still incorrect) cycle handling