default type arguments, and minor fix