Misc cleanup, esp. in data-package page