Is now handling TEKST and PUNKT elements. + Refactor and clean-up.