This looks really good. You did forget Law Enforcement under the job cluster, but that does seem to be the only thing missing.
Do you have any interest in doing the formulas for the scoring? I am horrid at math and was forever getting my score incorrect.