Minor fixing, cleaned some extraneous debug statements, reorganized todo stuff.
Work on better name-matching schemes for series.