lots of small style changes