Topic/termination

Implement improved termination reasonning