Tested new meta-model and fixed numerous bugs.