checkout and billing tweaks and fixes