.scrutinizer fix and some changes