fixed things that need to be in setup