Cleaned up base packages.
Bug fixes.