fixed bugs, created new ones.