Use new Snapshotter class
Woops, fix bugs caught by unit tests