fixed setup stuff