minor fix and add leeway seconds notice change