Add scientific notation support and code fix