some class changes, markup improvements