move to php54
some improvements