many slight changes