lots o fixes!