Checkout

Enhancements of checkout