checkout process changed, some fixes