Fix up, add comments