Cleanup and additonal figures