a few more style changes