Some clean-up, and work on design of bus integration