fix a few million things