changes to astro/cal.py