Various fixes + Upgrades to the FileEdit module: