B8: transitions

bug fixes