Bugfixes + tested parsing on single page