Be stricter about what counts as a badb break, handle them better