fixed some drag and drop but still not working