Update file headers, and cosmetic changes to FS API