Mostly style changes, some functions written for output in header area.