latest changes and coordinate fixes