Improvements to 2D modeling, plotting