Bug fix + naming improvement to saveplot