Catch Up

Caught up on some missed out changes in this branch when the error
occurred trying to replace Bruce's '<?' tags with the proper '<?php'
tag.