Adding --timeout and handling INTs properly.