adjusted the PHP wrapper include, and other minor things