some fixes; reader's loading time is very slow