Many updates
Fixed