Fixing some PHP 5.3.3 bug + tidying up comments