Lay out the package.
minor updates