minor fixes: type name, reducing memory allocations