Fixing few issues, adding new packages.