fix stuff and things and stuff