Now with comments and PNGs.