memory fix and fixing project files