fix the catbus transitions, and remove a border (master)