Updated all magic numbers, and method descriptions

please check over