Updated model files

Updated model files; still need a lot of improvement, especially array
passing between procedures, and other declarations.