Bus model fixes and style changes.