fixes for php 5.3 and assorted bugs