checkpoint - more biz logic fixes