fixed viewer + increased performance of readers