more goalie fixes