Improvements for scrutinizer