fixing up issues