Fixed issue #55; fixed other bugs in the overview