some changes in coordsys
merge ok