More interactions among components. Bug fixes.