Updated php 55 to 54, minor changes