Few more fix to the plotings and predictions