refactored, added placeholder support, support for fixing the files