[Raji] Fixed some minor issues and changed lat long