re-did some fixes in plot that I swear I already did before