sandbox checkout removal + other quick fixes