Some small changes.
Headers updated.