checkout and other fixes