Plotting improvements and code cleanup, using graphics-utils