More functionality; rebuilt package.