style and info enhancements
merge master