Updated file headers.
Removed segfault.