some changes
merge fix
change coordsys