fixed bugs;