Some headers and comments

May do more if we get time before turning it in