Many updates (26/31)

Many updates