Update files and packages
Add fixes - update