pushed this stuff through PhpStorm

pushing this through PhpStorm fixed gazillions of little issues