fix some critical errrs3