Add bufkill, and drop some matplotlib thing