Fix and some files and resources (maybe finally for some time)