Code cleanup and new program options for size and zoom.