Astrometry

Merge astrometry updates with local changes.