Added draggable events, some other changes