API tick, ref updates & some comment edits