Miscellaneous updates, plus CM12 setup