Updates based on comments, new image