Upgrade to M2 and beef up some doco.