Fixed shading and the position of the end intersection in plots.
Some cleanups.