minor updates / name changes