catbus updates (master)