Added time axis, some other changes.