debug visio etc
merge master