warnings in orange, misc fixes/refactoring