Some clean ups, mostly to do with ^C now working.