fixed errrs