Fixed onDropped and stiffened things up