snapshot improvements