Make location,mean more consistent

The location. functions should only deal with the first two parameters.