General fixups, trying to build a model