Tweaks to interactive terminal