fixing termination behaviour issue and commenting scaling