trying to fix stuff and clean up stuff