refactored code
fixed bugs in FDrop