fixed some files from last commit