M3: Rest of files and minor updates