Update and a few fixes