fixed bugs...