Finished 7. Small bugfix.