Small improvements in parser, allowing more zoomlevels