bunch of style changes.