fix a zillion things