Fixed arrays, removed some spurious comments.