fixing the package to work again ... and adds defaults properly