Various fixes for bus-code. Things work now.