some new fixes
all files chnged