Credit Andrew fix Alpha Bug of BT558 + small cleanup