Fixes grapher, improves num