bug fix.

wire up everything