fixed setup some more