comp and wireframe updates.

Signed-off-by: Craig Godfrey <repeater@gmail.com>