header cleanup. filled out some code.