Typos in filenames fixed, 4.2 optimized