6.1

fixes and dragndrop begin
