fixed drag&drop functions and more