comments and fixed first snapshot issue