some improvements an renamings