many style fixes