Fixed local buses and slightly changed the bus api