adding/improving drag&drop highlighting on trees and cleaning up