fix some problems 2