Lots o fixes