update changes from korpling for September

update changes from korpling for September