Fixes and more packages added