fix my math, and some naming things
Merge pull request #6 from mediocregopher/maths

fix my math, and some naming things