various minor improvements
merged