Mostly made corrections to packaging