Fixed text mapping, some minor changes