Working on composed models, minor cleanup.