Some plotting improvements