Many updates (6/31)

Many updates