code scrub & comments
augment extras API