Adds improvements to the checkout client and fixes some bugs