Add comments and touch up.