interface update + behavior fix
tired.