fix up issues..