Fixed up issues still need to space