Fix and improve interactive execution and controls