fixed up issues