various markup enhancements