Implement some of Al's corrections