minor renames
consistent drag point
some event handling function cleanup