more on multi scripting support
integrate Roman's fixes from today
merged from upstream