may have fixed bugs...