Clean up INPUT command, minor behavior changes.