- some bug fixes in checkout flow