Bug fixes

Fixed units for equations and changed equations slightly to make the math better