change file name and more fixes