Fixed 2GB file size limit; cosmetic changes