code cleanup: add missing vars
BugFix: x-val of combined plot has to be a date