implemented some of the quick hit fixes