style, data and markup fixes