Add header comments, 2 #warnings