Lots of drag-and-drop bug fixes... frustrating, but working OK now