minor mods and name change