Initial version

Small header changes.