Added a few constants

Added G and c and made some redundancies in some of the unit conversions.