Inputs checked better

And better output.