Fix stupid error in how the Snapshot was being constructed and tidy up