Numerous fixes & new warranty management implementation