final updates (hopefully...)