moved enums into dataspecification and fixed more issues withe nums via value