Fixed a number conversion bug and added automatic time resolve as a separate button