More final updates and fixes to make plot behavior more accurate