various style and markup updates