fix stuff and things