lots of style changes
merge fixes