fix some critical errrs4