Autocomplete for phpStorm
Code fixes and  improvements