fix a few little bits