v2.9.2 - Improvements, Fixed drop-location

Code improvements. Fixed a drop-location problem.