Minor naming adjustment
Readded scalar-valued functions of vectors/matrices