Input control
improve inputs