some fixes
scrutinizer