Few tweaks, as well as new format files