Rearrange. PHPDoc updates. Fix CS. Other little changes.