request input, better termination, minor cleanups