Minor changes and figure creation