Changed many things, mainly the terminal