Added auto depend for headers
Edit comments & spacing