minor fixes and drag/drop opt
merge