merge fixes for interactive governor, credits: Todd Poynor