Fixed a bunch of bugs with checkout