Minor changes for figure making

see changed m files