Bring in comments from other three images

and fix some other little things