Updated some of the constants and class members.

Hopefully their function is a bit clearer with this update