tweaks and astropy integration