bunch o fixes