Changes to save figures as .fig as well as .bmp.
Fix Figure saving.