combined PSR2 and Ecg rules, small updates;