Fixed some bugs to make the overview work. (refs issue #12)