Fix inputs tool logic and add new formatting options.

Fix inputs tool logic and add new formatting options. #1418