Added to checkout, fixed bugs