Editions and small improves on the package

Made some improvements and fixes around the package.