some tweaks, got phpstorm in