more model cleanup, trying to add missing connections