Some fixes and phpstorm configuration