fixed bugs. done.