lot o fixes