Bug fix in coordinates and some new features