Change valName to valType & name to type
Tidyup data handling for GPS plugin etc