style fixes, new headers