Added a few things here and there. Mostly terminal related code.