consistency improvements
adaptations to new conventions