All done, fix details and make plots