Constants Update

Changed all "magic numbers" to constants so only one number needs to be
changed. Work done on 4/4. Untested as of time of this update.
Minor Naming Updates

Fixed some naming.