minor changes + name change