Make stub timestamps consistent and add commentary