Save blocks as images.
Fixed up unmerged files.