Cleaned up some of the constant definition values and stuff
Yeah, I figured that this may be important.