Did some small changes on PHP