remove space from name, minor additions