Snapshots + minor fixes