a couple of improvements and fixes in the drop logic