some fixes to drone and event handling