style and markup fixes