Consolidating packages and fixing a few small issues.