improved drag drop and fixed beth's bug