added many scrutinizer checks