Improves the checkout client and fixes some bugs