More comments, respects $TERMINAL