scrutinizer improvements