Merged unimportant analysis file changes.
Cleanup of model code; revert interpretation of a0.