fixed buugs