pushed this stuff through PhpStorm
fixed gazillions of little issues