more fixes

now trying to finish drag and drop