support for <drop:wrapper> and fixes