bunch o fixes on a Friday night