Minor fixes
Work on type hinting (May now require PHP 7.1+)