Fix decimal point bug
Enhance future functions