fix for mixed timeseries data and other data sometimes resulting in wrong names
slightly more elegant version of previous fix
finalized support for timeseries objects, smoothed out hopefully all of the minor quirks and inconsistencies