merge

-last fix merge
-some spells