lots of style related changes