and further improvements to the package