Updates based on comments in Github.