lots more style changes