added droppstate and bug fixes