resolved checkout bugs