some last style fixes