bug fixes and unselect option