snapmergepuppy: fixes and performance improvements