CJFWeatherhead Minor updates