fix stuff setup