Fix more bugs, change observer for Stats

Change from valve controller to temp valve manager, since that's what is
actually intended to be tracked.