Fixed minor issues, added ^C handling and removed
polling delay -- we're hardly fast enough as it is.