Working on Chrises comments on corrections.