many changes

a looot