and more style changes