BAPC, state machine enum fix, messaging fix