Various updates + Deps updated.
Remove shrinkwrap & Minor changes.