start to make text labels editable; code cleanup; some renamings