better short drag handling
tests fixed