some adjustments to interactive mode