better math

Now with really better math.