small modifications
a few renamings