Tweaks and add plot