small set of fiexes and new support for the drop field contents bug