updates bus fixes - still needs some work to done done