some settings updates for PSR-2 and probably some updates