Fixed up drag + drop somewhat.