Making some changes
Fixing headers.
merged adunk/ed