Various corrections/updates