fixed up return/checkout a bit