done, but terminal echo-back bug still exists.