fix my math, and some naming things