Plot performance increase

Fixed plotting data structures and canvasifying the plotting.