Matplotlib related enhancements. Figures now treated in more pythonish way.