fixed compatibility with php 5.4, typos