Lots o fixes!