added missing package.
added missing mass, and other tweaks.