fixed found bugs