lots o fixes