style and markup enhancements