fixes to %^&*^%