removed #includes, primes and latlon fix