fixes to compatibility with CMSMS-2 and PHP7;<br />a few minor fixes;