New file headers. Minor fixes.