Better future-proofing for CMSMS 1.11 compatibility, bug fix and a few more features.

Anyone using v1.0.11 should upgrade immediately.