various changes mostly forgotten