some more cleanups, fleshed out the data models a bit