World update with a few fixes