Adding Terminal + tweaking error logging