merging mainly style fixes from master